diff --git a/compiler/sempass2.nim b/compiler/sempass2.nim
index 65d216b831..7707d1a248 100644
--- a/compiler/sempass2.nim
+++ b/compiler/sempass2.nim
@@ -379,7 +379,9 @@ proc useVar(a: PEffects, n: PNode) =
       # If the variable is explicitly marked as .noinit. do not emit any error
       a.init.add s.id
     elif s.id notin a.init:
-      if s.typ.requiresInit:
+      if s.kind == skResult and tfRequiresInit in s.typ.flags:
+        localError(a.config, n.info, "'result' requires explicit initialization")
+      elif s.typ.requiresInit:
         message(a.config, n.info, warnProveInit, s.name.s)
       elif a.leftPartOfAsgn <= 0:
         if strictDefs in a.c.features:
diff --git a/compiler/semtypes.nim b/compiler/semtypes.nim
index 42efcd2399..9d660a3bec 100644
--- a/compiler/semtypes.nim
+++ b/compiler/semtypes.nim
@@ -1147,7 +1147,9 @@ proc semAnyRef(c: PContext; n: PNode; kind: TTypeKind; prev: PType): PType =
       let t = newTypeS(tySink, c, result)
       result = t
     else: discard
-    if result.kind == tyRef and c.config.selectedGC in {gcArc, gcOrc, gcAtomicArc}:
+    if result.kind == tyRef and 
+        c.config.selectedGC in {gcArc, gcOrc, gcAtomicArc} and
+        tfTriggersCompileTime notin result.flags:
       result.flags.incl tfHasAsgn
 
 proc findEnforcedStaticType(t: PType): PType =
diff --git a/compiler/transf.nim b/compiler/transf.nim
index c6f0dbb332..197e073477 100644
--- a/compiler/transf.nim
+++ b/compiler/transf.nim
@@ -828,12 +828,20 @@ proc transformFor(c: PTransf, n: PNode): PNode =
         t = formal.ast.typ # better use the type that actually has a destructor.
       elif t.destructor == nil and arg.typ.destructor != nil:
         t = arg.typ
-      # generate a temporary and produce an assignment statement:
-      var temp = newTemp(c, t, formal.info)
-      #incl(temp.sym.flags, sfCursor)
-      addVar(v, temp)
-      stmtList.add(newAsgnStmt(c, nkFastAsgn, temp, arg, true))
-      newC.mapping[formal.itemId] = temp
+
+      if arg.kind in {nkDerefExpr, nkHiddenDeref}:
+        # optimizes for `[]` # bug #24093
+        var temp = newTemp(c, arg[0].typ, formal.info)
+        addVar(v, temp)
+        stmtList.add(newAsgnStmt(c, nkFastAsgn, temp, arg[0], true))
+        newC.mapping[formal.itemId] = newDeref(temp)
+      else:
+        # generate a temporary and produce an assignment statement:
+        var temp = newTemp(c, t, formal.info)
+        #incl(temp.sym.flags, sfCursor)
+        addVar(v, temp)
+        stmtList.add(newAsgnStmt(c, nkFastAsgn, temp, arg, true))
+        newC.mapping[formal.itemId] = temp
     of paVarAsgn:
       assert(skipTypes(formal.typ, abstractInst).kind in {tyVar, tyLent})
       newC.mapping[formal.itemId] = arg
diff --git a/koch.nim b/koch.nim
index dbca93a0d4..48cd2cdcb2 100644
--- a/koch.nim
+++ b/koch.nim
@@ -13,7 +13,7 @@ const
   # examples of possible values for repos: Head, ea82b54
   NimbleStableCommit = "9207e8b2bbdf66b5a4d1020214cff44d2d30df92" # 0.20.1
   AtlasStableCommit = "26cecf4d0cc038d5422fc1aa737eec9c8803a82b" # 0.9
-  ChecksumsStableCommit = "f8f6bd34bfa3fe12c64b919059ad856a96efcba0" # 2.0.1
+  ChecksumsStableCommit = "0b8e46379c5bc1bf73d8b3011908389c60fb9b98" # 2.0.1
   SatStableCommit = "faf1617f44d7632ee9601ebc13887644925dcc01"
 
   NimonyStableCommit = "1dbabac403ae32e185ee4c29f006d04e04b50c6d" # unversioned \
diff --git a/tests/errmsgs/t25117.nim b/tests/errmsgs/t25117.nim
new file mode 100644
index 0000000000..1f63e65b49
--- /dev/null
+++ b/tests/errmsgs/t25117.nim
@@ -0,0 +1,13 @@
+discard """
+  errormsg: "'result' requires explicit initialization"
+"""
+
+type RI {.requiresInit.} = object
+  v: int
+
+proc xxx(v: var RI) = discard
+
+proc f(T: type): T =
+  xxx(result) # Should fail
+
+discard f(RI)
\ No newline at end of file
diff --git a/tests/errmsgs/t25120.nim b/tests/errmsgs/t25120.nim
new file mode 100644
index 0000000000..217bba1fa7
--- /dev/null
+++ b/tests/errmsgs/t25120.nim
@@ -0,0 +1,6 @@
+discard """
+  errormsg: "request to generate code for .compileTime proc: riesig"
+"""
+
+proc riesig(): NimNode = discard
+discard riesig()