diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.kt
index 9220211d5af..995b779c47d 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.kt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/complexPostponedCfg.kt
@@ -7,7 +7,7 @@ interface FirFunctionCall : FirBase
 fun foo(statements: List<FirBase>, arguments: List<FirBase>, explicitReceiver: FirBase): List<FirFunctionCall> {
 
     val firstCalls = with(statements.last() as FirFunctionCall) setCall@{
-        <!OPT_IN_USAGE_ERROR!>buildList<!> {
+        buildList {
             add(this@setCall)
             with(arguments.last() as FirFunctionCall) plusCall@{
                 add(this@plusCall)
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceAndCoercionToUnit.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceAndCoercionToUnit.kt
index 7e53c3593be..a5cc7aa9a9b 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceAndCoercionToUnit.kt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceAndCoercionToUnit.kt
@@ -2,7 +2,7 @@ class DropDownComponent<T : Any>(val initialValues: List<T>)
 
 fun test(strings: List<String>) {
     val dropDown = DropDownComponent(
-        initialValues = <!OPT_IN_USAGE_ERROR!>buildList<!> {
+        initialValues = buildList {
             addAll(strings)
         }
     )
diff --git a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.kt b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.kt
index 4a04bfca0b4..24b0e564137 100644
--- a/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.kt
+++ b/compiler/fir/analysis-tests/testData/resolveWithStdlib/inference/builderInferenceFromStdlib.kt
@@ -1,5 +1,5 @@
 fun test_1() {
-    val list = <!OPT_IN_USAGE_ERROR!>buildList<!> {
+    val list = buildList {
         add("")
     }
     takeList(list)
diff --git a/kotlin-native/runtime/src/main/kotlin/kotlin/collections/Collections.kt b/kotlin-native/runtime/src/main/kotlin/kotlin/collections/Collections.kt
index 4072e374f3e..ce8b1cd69ab 100644
--- a/kotlin-native/runtime/src/main/kotlin/kotlin/collections/Collections.kt
+++ b/kotlin-native/runtime/src/main/kotlin/kotlin/collections/Collections.kt
@@ -43,7 +43,6 @@ public interface MutableIterable<out T> : Iterable<T> {
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 @kotlin.internal.InlineOnly
 internal actual inline fun <E> buildListInternal(builderAction: MutableList<E>.() -> Unit): List<E> {
     return ArrayList<E>().apply(builderAction).build()
@@ -51,7 +50,6 @@ internal actual inline fun <E> buildListInternal(builderAction: MutableList<E>.(
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 @kotlin.internal.InlineOnly
 internal actual inline fun <E> buildListInternal(capacity: Int, builderAction: MutableList<E>.() -> Unit): List<E> {
     return ArrayList<E>(capacity).apply(builderAction).build()
diff --git a/kotlin-native/runtime/src/main/kotlin/kotlin/collections/Maps.kt b/kotlin-native/runtime/src/main/kotlin/kotlin/collections/Maps.kt
index c4255e69724..f4ba76b9180 100644
--- a/kotlin-native/runtime/src/main/kotlin/kotlin/collections/Maps.kt
+++ b/kotlin-native/runtime/src/main/kotlin/kotlin/collections/Maps.kt
@@ -7,7 +7,6 @@ package kotlin.collections
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 @kotlin.internal.InlineOnly
 internal actual inline fun <K, V> buildMapInternal(builderAction: MutableMap<K, V>.() -> Unit): Map<K, V> {
     return HashMap<K, V>().apply(builderAction).build()
@@ -15,7 +14,6 @@ internal actual inline fun <K, V> buildMapInternal(builderAction: MutableMap<K,
 
 @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 HashMap<K, V>(capacity).apply(builderAction).build()
diff --git a/kotlin-native/runtime/src/main/kotlin/kotlin/collections/Sets.kt b/kotlin-native/runtime/src/main/kotlin/kotlin/collections/Sets.kt
index 0757b4574f0..5c7179c0a52 100644
--- a/kotlin-native/runtime/src/main/kotlin/kotlin/collections/Sets.kt
+++ b/kotlin-native/runtime/src/main/kotlin/kotlin/collections/Sets.kt
@@ -13,7 +13,6 @@ 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 HashSet<E>().apply(builderAction).build()
@@ -21,7 +20,6 @@ internal actual inline fun <E> buildSetInternal(builderAction: MutableSet<E>.()
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 @kotlin.internal.InlineOnly
 internal actual inline fun <E> buildSetInternal(capacity: Int, builderAction: MutableSet<E>.() -> Unit): Set<E> {
     return HashSet<E>(capacity).apply(builderAction).build()
diff --git a/libraries/stdlib/api/js-v1/kotlin.collections.kt b/libraries/stdlib/api/js-v1/kotlin.collections.kt
index feea90efb63..3ab7bf70f97 100644
--- a/libraries/stdlib/api/js-v1/kotlin.collections.kt
+++ b/libraries/stdlib/api/js-v1/kotlin.collections.kt
@@ -87,38 +87,38 @@ public inline fun <T> arrayListOf(): kotlin.collections.ArrayList<T>
 
 public fun <T> arrayListOf(vararg elements: T): kotlin.collections.ArrayList<T>
 
-@kotlin.SinceKotlin(version = "1.3")
-@kotlin.ExperimentalStdlibApi
+@kotlin.SinceKotlin(version = "1.6")
+@kotlin.WasExperimental(markerClass = {kotlin.ExperimentalStdlibApi::class})
 @kotlin.internal.InlineOnly
 public inline fun <E> buildList(capacity: kotlin.Int, @kotlin.BuilderInference
 builderAction: kotlin.collections.MutableList<E>.() -> kotlin.Unit): kotlin.collections.List<E>
 
-@kotlin.SinceKotlin(version = "1.3")
-@kotlin.ExperimentalStdlibApi
+@kotlin.SinceKotlin(version = "1.6")
+@kotlin.WasExperimental(markerClass = {kotlin.ExperimentalStdlibApi::class})
 @kotlin.internal.InlineOnly
 public inline fun <E> buildList(@kotlin.BuilderInference
 builderAction: kotlin.collections.MutableList<E>.() -> kotlin.Unit): kotlin.collections.List<E>
 
-@kotlin.SinceKotlin(version = "1.3")
-@kotlin.ExperimentalStdlibApi
+@kotlin.SinceKotlin(version = "1.6")
+@kotlin.WasExperimental(markerClass = {kotlin.ExperimentalStdlibApi::class})
 @kotlin.internal.InlineOnly
 public inline fun <K, V> buildMap(capacity: kotlin.Int, @kotlin.BuilderInference
 builderAction: kotlin.collections.MutableMap<K, V>.() -> kotlin.Unit): kotlin.collections.Map<K, V>
 
-@kotlin.SinceKotlin(version = "1.3")
-@kotlin.ExperimentalStdlibApi
+@kotlin.SinceKotlin(version = "1.6")
+@kotlin.WasExperimental(markerClass = {kotlin.ExperimentalStdlibApi::class})
 @kotlin.internal.InlineOnly
 public inline fun <K, V> buildMap(@kotlin.BuilderInference
 builderAction: kotlin.collections.MutableMap<K, V>.() -> kotlin.Unit): kotlin.collections.Map<K, V>
 
-@kotlin.SinceKotlin(version = "1.3")
-@kotlin.ExperimentalStdlibApi
+@kotlin.SinceKotlin(version = "1.6")
+@kotlin.WasExperimental(markerClass = {kotlin.ExperimentalStdlibApi::class})
 @kotlin.internal.InlineOnly
 public inline fun <E> buildSet(capacity: kotlin.Int, @kotlin.BuilderInference
 builderAction: kotlin.collections.MutableSet<E>.() -> kotlin.Unit): kotlin.collections.Set<E>
 
-@kotlin.SinceKotlin(version = "1.3")
-@kotlin.ExperimentalStdlibApi
+@kotlin.SinceKotlin(version = "1.6")
+@kotlin.WasExperimental(markerClass = {kotlin.ExperimentalStdlibApi::class})
 @kotlin.internal.InlineOnly
 public inline fun <E> buildSet(@kotlin.BuilderInference
 builderAction: kotlin.collections.MutableSet<E>.() -> kotlin.Unit): kotlin.collections.Set<E>
diff --git a/libraries/stdlib/api/js/kotlin.collections.kt b/libraries/stdlib/api/js/kotlin.collections.kt
index 77a74bc6dae..082c6f68e26 100644
--- a/libraries/stdlib/api/js/kotlin.collections.kt
+++ b/libraries/stdlib/api/js/kotlin.collections.kt
@@ -87,38 +87,38 @@ public inline fun <T> arrayListOf(): kotlin.collections.ArrayList<T>
 
 public fun <T> arrayListOf(vararg elements: T): kotlin.collections.ArrayList<T>
 
-@kotlin.SinceKotlin(version = "1.3")
-@kotlin.ExperimentalStdlibApi
+@kotlin.SinceKotlin(version = "1.6")
+@kotlin.WasExperimental(markerClass = {kotlin.ExperimentalStdlibApi::class})
 @kotlin.internal.InlineOnly
 public inline fun <E> buildList(capacity: kotlin.Int, @kotlin.BuilderInference
 builderAction: kotlin.collections.MutableList<E>.() -> kotlin.Unit): kotlin.collections.List<E>
 
-@kotlin.SinceKotlin(version = "1.3")
-@kotlin.ExperimentalStdlibApi
+@kotlin.SinceKotlin(version = "1.6")
+@kotlin.WasExperimental(markerClass = {kotlin.ExperimentalStdlibApi::class})
 @kotlin.internal.InlineOnly
 public inline fun <E> buildList(@kotlin.BuilderInference
 builderAction: kotlin.collections.MutableList<E>.() -> kotlin.Unit): kotlin.collections.List<E>
 
-@kotlin.SinceKotlin(version = "1.3")
-@kotlin.ExperimentalStdlibApi
+@kotlin.SinceKotlin(version = "1.6")
+@kotlin.WasExperimental(markerClass = {kotlin.ExperimentalStdlibApi::class})
 @kotlin.internal.InlineOnly
 public inline fun <K, V> buildMap(capacity: kotlin.Int, @kotlin.BuilderInference
 builderAction: kotlin.collections.MutableMap<K, V>.() -> kotlin.Unit): kotlin.collections.Map<K, V>
 
-@kotlin.SinceKotlin(version = "1.3")
-@kotlin.ExperimentalStdlibApi
+@kotlin.SinceKotlin(version = "1.6")
+@kotlin.WasExperimental(markerClass = {kotlin.ExperimentalStdlibApi::class})
 @kotlin.internal.InlineOnly
 public inline fun <K, V> buildMap(@kotlin.BuilderInference
 builderAction: kotlin.collections.MutableMap<K, V>.() -> kotlin.Unit): kotlin.collections.Map<K, V>
 
-@kotlin.SinceKotlin(version = "1.3")
-@kotlin.ExperimentalStdlibApi
+@kotlin.SinceKotlin(version = "1.6")
+@kotlin.WasExperimental(markerClass = {kotlin.ExperimentalStdlibApi::class})
 @kotlin.internal.InlineOnly
 public inline fun <E> buildSet(capacity: kotlin.Int, @kotlin.BuilderInference
 builderAction: kotlin.collections.MutableSet<E>.() -> kotlin.Unit): kotlin.collections.Set<E>
 
-@kotlin.SinceKotlin(version = "1.3")
-@kotlin.ExperimentalStdlibApi
+@kotlin.SinceKotlin(version = "1.6")
+@kotlin.WasExperimental(markerClass = {kotlin.ExperimentalStdlibApi::class})
 @kotlin.internal.InlineOnly
 public inline fun <E> buildSet(@kotlin.BuilderInference
 builderAction: kotlin.collections.MutableSet<E>.() -> kotlin.Unit): kotlin.collections.Set<E>
diff --git a/libraries/stdlib/js/src/kotlin/collections.kt b/libraries/stdlib/js/src/kotlin/collections.kt
index bdd9c085c92..a3882d1f3ef 100644
--- a/libraries/stdlib/js/src/kotlin/collections.kt
+++ b/libraries/stdlib/js/src/kotlin/collections.kt
@@ -67,7 +67,6 @@ public fun <T> listOf(element: T): List<T> = arrayListOf(element)
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 @kotlin.internal.InlineOnly
 internal actual inline fun <E> buildListInternal(builderAction: MutableList<E>.() -> Unit): List<E> {
     return ArrayList<E>().apply(builderAction).build()
@@ -75,7 +74,6 @@ internal actual inline fun <E> buildListInternal(builderAction: MutableList<E>.(
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 @kotlin.internal.InlineOnly
 internal actual inline fun <E> buildListInternal(capacity: Int, builderAction: MutableList<E>.() -> Unit): List<E> {
     checkBuilderCapacity(capacity)
@@ -90,7 +88,6 @@ 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 LinkedHashSet<E>().apply(builderAction).build()
@@ -98,7 +95,6 @@ internal actual inline fun <E> buildSetInternal(builderAction: MutableSet<E>.()
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 @kotlin.internal.InlineOnly
 internal actual inline fun <E> buildSetInternal(capacity: Int, builderAction: MutableSet<E>.() -> Unit): Set<E> {
     return LinkedHashSet<E>(capacity).apply(builderAction).build()
@@ -113,7 +109,6 @@ 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 LinkedHashMap<K, V>().apply(builderAction).build()
@@ -121,7 +116,6 @@ internal actual inline fun <K, V> buildMapInternal(builderAction: MutableMap<K,
 
 @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 LinkedHashMap<K, V>(capacity).apply(builderAction).build()
@@ -261,7 +255,6 @@ internal actual fun mapCapacity(expectedSize: Int) = expectedSize
  * In JS no validation is made in Map/Set constructor yet.
  */
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 @PublishedApi
 internal fun checkBuilderCapacity(capacity: Int) {
     require(capacity >= 0) { "capacity must be non-negative." }
diff --git a/libraries/stdlib/jvm/src/kotlin/collections/CollectionsJVM.kt b/libraries/stdlib/jvm/src/kotlin/collections/CollectionsJVM.kt
index d229c8d25a2..df5b0dd4173 100644
--- a/libraries/stdlib/jvm/src/kotlin/collections/CollectionsJVM.kt
+++ b/libraries/stdlib/jvm/src/kotlin/collections/CollectionsJVM.kt
@@ -21,7 +21,6 @@ public fun <T> listOf(element: T): List<T> = java.util.Collections.singletonList
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 @kotlin.internal.InlineOnly
 internal actual inline fun <E> buildListInternal(builderAction: MutableList<E>.() -> Unit): List<E> {
     return build(createListBuilder<E>().apply(builderAction))
@@ -29,7 +28,6 @@ internal actual inline fun <E> buildListInternal(builderAction: MutableList<E>.(
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 @kotlin.internal.InlineOnly
 internal actual inline fun <E> buildListInternal(capacity: Int, builderAction: MutableList<E>.() -> Unit): List<E> {
     return build(createListBuilder<E>(capacity).apply(builderAction))
@@ -37,21 +35,18 @@ internal actual inline fun <E> buildListInternal(capacity: Int, builderAction: M
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 internal fun <E> createListBuilder(): MutableList<E> {
     return ListBuilder<E>()
 }
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 internal fun <E> createListBuilder(capacity: Int): MutableList<E> {
     return ListBuilder<E>(capacity)
 }
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 internal fun <E> build(builder: MutableList<E>): List<E> {
     return (builder as ListBuilder<E>).build()
 }
diff --git a/libraries/stdlib/jvm/src/kotlin/collections/MapsJVM.kt b/libraries/stdlib/jvm/src/kotlin/collections/MapsJVM.kt
index e90e51fe57c..0b914252295 100644
--- a/libraries/stdlib/jvm/src/kotlin/collections/MapsJVM.kt
+++ b/libraries/stdlib/jvm/src/kotlin/collections/MapsJVM.kt
@@ -28,7 +28,6 @@ public fun <K, V> mapOf(pair: Pair<K, V>): Map<K, V> = java.util.Collections.sin
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 @kotlin.internal.InlineOnly
 internal actual inline fun <K, V> buildMapInternal(builderAction: MutableMap<K, V>.() -> Unit): Map<K, V> {
     return build(createMapBuilder<K, V>().apply(builderAction))
@@ -36,7 +35,6 @@ internal actual inline fun <K, V> buildMapInternal(builderAction: MutableMap<K,
 
 @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 build(createMapBuilder<K, V>(capacity).apply(builderAction))
@@ -44,21 +42,18 @@ internal actual inline fun <K, V> buildMapInternal(capacity: Int, builderAction:
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 internal fun <K, V> createMapBuilder(): MutableMap<K, V> {
     return MapBuilder()
 }
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 internal fun <K, V> createMapBuilder(capacity: Int): MutableMap<K, V> {
     return MapBuilder(capacity)
 }
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 internal fun <K, V> build(builder: MutableMap<K, V>): Map<K, V> {
     return (builder as MapBuilder<K, V>).build()
 }
diff --git a/libraries/stdlib/jvm/src/kotlin/collections/SetsJVM.kt b/libraries/stdlib/jvm/src/kotlin/collections/SetsJVM.kt
index e58181e9e76..f233ad0aaaa 100644
--- a/libraries/stdlib/jvm/src/kotlin/collections/SetsJVM.kt
+++ b/libraries/stdlib/jvm/src/kotlin/collections/SetsJVM.kt
@@ -19,7 +19,6 @@ public fun <T> setOf(element: T): Set<T> = java.util.Collections.singleton(eleme
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 @kotlin.internal.InlineOnly
 internal actual inline fun <E> buildSetInternal(builderAction: MutableSet<E>.() -> Unit): Set<E> {
     return build(createSetBuilder<E>().apply(builderAction))
@@ -27,7 +26,6 @@ internal actual inline fun <E> buildSetInternal(builderAction: MutableSet<E>.()
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 @kotlin.internal.InlineOnly
 internal actual inline fun <E> buildSetInternal(capacity: Int, builderAction: MutableSet<E>.() -> Unit): Set<E> {
     return build(createSetBuilder<E>(capacity).apply(builderAction))
@@ -35,21 +33,18 @@ internal actual inline fun <E> buildSetInternal(capacity: Int, builderAction: Mu
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 internal fun <E> createSetBuilder(): MutableSet<E> {
     return SetBuilder()
 }
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 internal fun <E> createSetBuilder(capacity: Int): MutableSet<E> {
     return SetBuilder(capacity)
 }
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 internal fun <E> build(builder: MutableSet<E>): Set<E> {
     return (builder as SetBuilder<E>).build()
 }
diff --git a/libraries/stdlib/jvm/src/kotlin/collections/builders/ListBuilder.kt b/libraries/stdlib/jvm/src/kotlin/collections/builders/ListBuilder.kt
index dd561ca0411..eef8cd704ed 100644
--- a/libraries/stdlib/jvm/src/kotlin/collections/builders/ListBuilder.kt
+++ b/libraries/stdlib/jvm/src/kotlin/collections/builders/ListBuilder.kt
@@ -397,7 +397,6 @@ internal class SerializedCollection(
         }
     }
 
-    @OptIn(ExperimentalStdlibApi::class)
     override fun readExternal(input: java.io.ObjectInput) {
         val flags = input.readByte().toInt()
         val tag = flags and 1
diff --git a/libraries/stdlib/jvm/src/kotlin/collections/builders/MapBuilder.kt b/libraries/stdlib/jvm/src/kotlin/collections/builders/MapBuilder.kt
index 0b0e8c5a545..d90c4d538d6 100644
--- a/libraries/stdlib/jvm/src/kotlin/collections/builders/MapBuilder.kt
+++ b/libraries/stdlib/jvm/src/kotlin/collections/builders/MapBuilder.kt
@@ -651,7 +651,6 @@ private class SerializedMap(
         }
     }
 
-    @OptIn(ExperimentalStdlibApi::class)
     override fun readExternal(input: java.io.ObjectInput) {
         val flags = input.readByte().toInt()
         if (flags != 0) {
diff --git a/libraries/stdlib/src/kotlin/collections/Collections.kt b/libraries/stdlib/src/kotlin/collections/Collections.kt
index 000141f0bae..af8647cf25b 100644
--- a/libraries/stdlib/src/kotlin/collections/Collections.kt
+++ b/libraries/stdlib/src/kotlin/collections/Collections.kt
@@ -166,8 +166,8 @@ public inline fun <T> MutableList(size: Int, init: (index: Int) -> T): MutableLi
  *
  * @sample samples.collections.Builders.Lists.buildListSample
  */
-@SinceKotlin("1.3")
-@ExperimentalStdlibApi
+@SinceKotlin("1.6")
+@WasExperimental(ExperimentalStdlibApi::class)
 @kotlin.internal.InlineOnly
 public inline fun <E> buildList(@BuilderInference builderAction: MutableList<E>.() -> Unit): List<E> {
     contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
@@ -176,7 +176,6 @@ public inline fun <E> buildList(@BuilderInference builderAction: MutableList<E>.
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 @kotlin.internal.InlineOnly
 internal expect inline fun <E> buildListInternal(builderAction: MutableList<E>.() -> Unit): List<E>
 
@@ -195,8 +194,8 @@ internal expect inline fun <E> buildListInternal(builderAction: MutableList<E>.(
  *
  * @sample samples.collections.Builders.Lists.buildListSampleWithCapacity
  */
-@SinceKotlin("1.3")
-@ExperimentalStdlibApi
+@SinceKotlin("1.6")
+@WasExperimental(ExperimentalStdlibApi::class)
 @kotlin.internal.InlineOnly
 public inline fun <E> buildList(capacity: Int, @BuilderInference builderAction: MutableList<E>.() -> Unit): List<E> {
     contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
@@ -205,7 +204,6 @@ public inline fun <E> buildList(capacity: Int, @BuilderInference builderAction:
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 @kotlin.internal.InlineOnly
 internal expect inline fun <E> buildListInternal(capacity: Int, builderAction: MutableList<E>.() -> Unit): List<E>
 
diff --git a/libraries/stdlib/src/kotlin/collections/Maps.kt b/libraries/stdlib/src/kotlin/collections/Maps.kt
index f47151e333f..8ada42ce7f9 100644
--- a/libraries/stdlib/src/kotlin/collections/Maps.kt
+++ b/libraries/stdlib/src/kotlin/collections/Maps.kt
@@ -136,8 +136,8 @@ public fun <K, V> linkedMapOf(vararg pairs: Pair<K, V>): LinkedHashMap<K, V> = p
  *
  * @sample samples.collections.Builders.Maps.buildMapSample
  */
-@SinceKotlin("1.3")
-@ExperimentalStdlibApi
+@SinceKotlin("1.6")
+@WasExperimental(ExperimentalStdlibApi::class)
 @kotlin.internal.InlineOnly
 public inline fun <K, V> buildMap(@BuilderInference builderAction: MutableMap<K, V>.() -> Unit): Map<K, V> {
     contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
@@ -146,7 +146,6 @@ public inline fun <K, V> buildMap(@BuilderInference builderAction: MutableMap<K,
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 @kotlin.internal.InlineOnly
 internal expect inline fun <K, V> buildMapInternal(builderAction: MutableMap<K, V>.() -> Unit): Map<K, V>
 
@@ -167,8 +166,8 @@ internal expect inline fun <K, V> buildMapInternal(builderAction: MutableMap<K,
  *
  * @sample samples.collections.Builders.Maps.buildMapSample
  */
-@SinceKotlin("1.3")
-@ExperimentalStdlibApi
+@SinceKotlin("1.6")
+@WasExperimental(ExperimentalStdlibApi::class)
 @kotlin.internal.InlineOnly
 public inline fun <K, V> buildMap(capacity: Int, @BuilderInference builderAction: MutableMap<K, V>.() -> Unit): Map<K, V> {
     contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
@@ -177,7 +176,6 @@ public inline fun <K, V> buildMap(capacity: Int, @BuilderInference builderAction
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 @kotlin.internal.InlineOnly
 internal expect inline fun <K, V> buildMapInternal(capacity: Int, builderAction: MutableMap<K, V>.() -> Unit): Map<K, V>
 
diff --git a/libraries/stdlib/src/kotlin/collections/Sets.kt b/libraries/stdlib/src/kotlin/collections/Sets.kt
index e8da88e9e0a..606a235682e 100644
--- a/libraries/stdlib/src/kotlin/collections/Sets.kt
+++ b/libraries/stdlib/src/kotlin/collections/Sets.kt
@@ -122,8 +122,8 @@ public fun <T : Any> setOfNotNull(vararg elements: T?): Set<T> {
  *
  * @sample samples.collections.Builders.Sets.buildSetSample
  */
-@SinceKotlin("1.3")
-@ExperimentalStdlibApi
+@SinceKotlin("1.6")
+@WasExperimental(ExperimentalStdlibApi::class)
 @kotlin.internal.InlineOnly
 public inline fun <E> buildSet(@BuilderInference builderAction: MutableSet<E>.() -> Unit): Set<E> {
     contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
@@ -132,7 +132,6 @@ public inline fun <E> buildSet(@BuilderInference builderAction: MutableSet<E>.()
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 @kotlin.internal.InlineOnly
 internal expect inline fun <E> buildSetInternal(builderAction: MutableSet<E>.() -> Unit): Set<E>
 
@@ -153,8 +152,8 @@ internal expect inline fun <E> buildSetInternal(builderAction: MutableSet<E>.()
  *
  * @sample samples.collections.Builders.Sets.buildSetSample
  */
-@SinceKotlin("1.3")
-@ExperimentalStdlibApi
+@SinceKotlin("1.6")
+@WasExperimental(ExperimentalStdlibApi::class)
 @kotlin.internal.InlineOnly
 public inline fun <E> buildSet(capacity: Int, @BuilderInference builderAction: MutableSet<E>.() -> Unit): Set<E> {
     contract { callsInPlace(builderAction, InvocationKind.EXACTLY_ONCE) }
@@ -163,7 +162,6 @@ public inline fun <E> buildSet(capacity: Int, @BuilderInference builderAction: M
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 @kotlin.internal.InlineOnly
 internal expect inline fun <E> buildSetInternal(capacity: Int, builderAction: MutableSet<E>.() -> Unit): Set<E>
 
diff --git a/libraries/stdlib/wasm/src/kotlin/collections/Collections.kt b/libraries/stdlib/wasm/src/kotlin/collections/Collections.kt
index cfcd91eb826..3adb7eafd81 100644
--- a/libraries/stdlib/wasm/src/kotlin/collections/Collections.kt
+++ b/libraries/stdlib/wasm/src/kotlin/collections/Collections.kt
@@ -50,7 +50,6 @@ internal actual fun checkCountOverflow(count: Int): Int = TODO("Wasm stdlib: Col
 
 @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")
@@ -58,7 +57,6 @@ internal actual inline fun <E> buildListInternal(builderAction: MutableList<E>.(
 
 @PublishedApi
 @SinceKotlin("1.3")
-@ExperimentalStdlibApi
 @kotlin.internal.InlineOnly
 internal actual inline fun <E> buildListInternal(capacity: Int, builderAction: MutableList<E>.() -> Unit): List<E> {
     checkBuilderCapacity(capacity)
@@ -73,7 +71,6 @@ 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")
@@ -81,7 +78,6 @@ internal actual inline fun <E> buildSetInternal(builderAction: MutableSet<E>.()
 
 @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")
@@ -96,7 +92,6 @@ 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")
@@ -104,7 +99,6 @@ internal actual inline fun <K, V> buildMapInternal(builderAction: MutableMap<K,
 
 @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")
diff --git a/libraries/stdlib/wasm/src/kotlin/collections/Maps.kt b/libraries/stdlib/wasm/src/kotlin/collections/Maps.kt
index 42038dd6088..b61974439ff 100644
--- a/libraries/stdlib/wasm/src/kotlin/collections/Maps.kt
+++ b/libraries/stdlib/wasm/src/kotlin/collections/Maps.kt
@@ -15,6 +15,5 @@ internal actual fun mapCapacity(expectedSize: Int): Int = TODO("Wasm stdlib: Map
  * 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